fix #18334: handle path with spaces on windows during bootstrap #18337
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jun 23, 2021
Merged
timotheecour
added
the
Ready For Review
Araq
reviewed
Jun 24, 2021
compiler/nim.nim
Outdated
| const dir = when defined(nimKochBootstrap): | ||
| # remove workaround pending bootstrap >= 1.5.1 | ||
| # refs https://github.com/nim-lang/Nim/issues/18334#issuecomment-867114536 | ||
| currentSourcePath.parentDir.quoteShell & "\\" |
There was a problem hiding this comment.
Quoting (quoteShell) only a part of the path is bad style. Why not simply:
when defined(amd64) and defined(windows) and defined(vcc) and not defined(nimKochBootstrap):
{.link: "../icons/nim-amd64-windows-vcc.res".}
when defined(i386) and defined(windows) and defined(vcc) and not defined(nimKochBootstrap):
{.link: "../icons/nim-i386-windows-vcc.res".}
There was a problem hiding this comment.
done;
but i had done it that way to preserve semantics (would be needed anyways if those files were not optional); in future if there's a situation where those are not optional, smthg like this should work:
template link2(a) =
const a2 =
when defined(nimKochBootstrap):
quoteShell(currentSourcePath.parentDir / a)
else: a
{.link: a2.}then use link2 in such places
timotheecour
force-pushed
the
pr_fix_18334_workaround_bootstrap_spaces
branch
from
4a114cf to
49ac7e7
Compare
Araq
added
merge_when_passes_CI
PMunch
pushed a commit
to PMunch/Nim
that referenced
this pull request
Mar 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #18334
refs #17875 (comment)
refs #18334 (comment)